#52 Tiny improvements