Fixed cross-platform stuff