Global key small class + small fixes