Fixes on transportform