Fix isset issues