Minor fixes

Just getting some fixes off my branch before the merge conflicts becomes a mess.