Minor changes to entities