Update build system.
Fix options struct.