MInor fixes to make solution build