Improve fixes