Rebuild with the new buildhx + manual fixes