Improvements from other projects