Remove some problems noted by lint