Fixed save issues, 0.8.2