Partially fixed build setup