additional trap exit fixes