Fixing missing lazy loaded properties.