[1776] Some minor changes