Tremap fixes