fix class signatures