Fixes for saving safe