Some more tab vs whitespace issues fixed