Some more quickfixes