[1776] Minor changes again