Fixes for reindent (needs more work)