Fixes for tattletale