Misc changes/fixes