Improve user-fixes/*