Fixed a few more Tab/whitespace issues