Couple of fixes while merging...
Fixed some whitespace