Fixes for perliminary saving (WIP)