Cross-platform issues

Fork useful cross-platform additions