Fixes on ticker