Fixes and save stuff