Convert spaces, fix bootstrap