platform fixes