JH's March 14th (trip tabs ++) fixes