several cross-platform enhancements