Small (trivial) fixes/changes