Several indentation and path fixes