Fixins

Some random small fixes.