More fixes, binpatching works