Fixes for warnings in submodule