Tweaks based on hlint