small fixes, Pull still crashes