Heapless fix

Small fixes