Fixes in portable tl