Misc fixes and issue resolutions