More fixes & to &&.

Missed these the first time 'cause I searched for ' & ' and
these ones were at the end of a line. :)