fix same build issues and update geb