General Fixes and changes