public and types fixups