additional cross-platform fixes