Version 2.1 Project items fixed