Fix for compiler errors