Make sure price objects remain price objects after save
Cleanups