Rebuild, misc small fixes