Options and indentation corrections.