Misc Bugfixes Save safe