Small bugs

A few non disruptive corrections