Fixes for compiler errors