Misc fixes and additions