Misc updates and fixes