A few small changes/improvements