Fixes by houndci