tiny rule fixes by timo