more click:fast fixes