Move to their respective procs.
Fix compile errors.