A couple mode small fixes.