A set of small fixes