more transform fixes