Fixed build for new jar packages