ngTap fixes