Minor platform fixes