Fixes for updated understanding of clicker applications