Fix problems with buildqueue and build api