Fix issue where only field was set in afterSave
Do some cleaning up in afterSave and _upload()