And even more quick-fixes :)