WIP. Fixing build process.