Compile and name fixes