Fixes on the way following SIS upgrade project