minor changes to class interfaces