Add correction to properties dict and fix fields for validation