Fix some platform dependent code (imports) I overlooked