fixes for swappable types