Fix accumulated lint issues, see issue #76