Improve user-fixes/si