Small fixes, plus one project