General Fixes and updates