fixing two things