Make heap interface more sane