Pack of small fixes