Fixes for tell