Misc changes and additions