make check-spaces fixes