More fixes for indentation and error messages