Change after_save and after_destroy callbacks to after_commit