BUG: Fixes for enabling iceTrickle