Fixed some left-overs of the spaces