Fixing jbuilder and validation problems.

Changes required for validation