More quick fixes