Fix libtidy problems