Numerous small fixes to push object