Minor multi-platform fixes