more tinynotation fixes