Get rid of uninitialized variables and an unintended override