Emergency fix for compile errors