Fix for compile errors