Clean up build configuration
Fix optional::swap