Minor fixes to first age custom set