Some fixes, start on code refs.