Fix unbox/push, other func fixes