Oops: Fixed some broken references created when moving stuff aroudn