Started fixing build process.