Oops, cleaning up lint warnings