Update build process, minor fixes