Immediate, small fixes