Fix achievement regression and compile errors