Misc updates
Merge remote-tracking branch 'homedir/master'