additional fixes for compilation