Fixed lots of borked references