Fix validation errors
Fix up style and validation issues with the games branch