A couple frontend fixes