Fix: various small fixes.