Tweak project handling