More work on cross-platform stuff