Fixing up some notices, cleaning up watch_only changes, replacing another trigger_error