Minor fix on platform check / white space fixes