Some very small fixes