Hot fix for compilation errors