Project tweaks and small fix