Temp fix for compile errors