Some other improovements