Updated build scripts and POMs