Fix all checkSpaces issues