more BS changes to make swift compiler happy