More small fixes after chaotic merge..