Tiny improvments