fixes for tempest generation