Merged some small tweaks from home.