Fixed save issues