Fixes for various txxxx tickets