Various fixes for Routine Save and Load