Merge branch 'tkm-fixes'