Series of small fixes