more bugfixes regarding the final built check