Build Fix & Changes for Frank's comments