Compile recent fixes