#132 Tiny improvements