New fixes for teaser