More Tirisfal fixes