Account for projects that don't have client assigned
Fix merge tomfoolery