Further indent fixes