Misc fixed for formatting