[#2128] Fixes per @WouterJ's suggestions