Fixes for file save