Handful of small fixes