More small fixes everywhere