Fix some coding carelessness