Two small details fix
Two small details fix