Fixed build issues - mixed spaces and tabs