Some minor changes/improvements