Attempt to fix compiles