Items, Schemes, Generation fixes