Small improvements
WIP