fixups for huskie integration