Bug fixes, build process updates