Ok, compiles clean now.