Fixes for cylon 0.16

Adjustments and fixes needed for compatibility with Cylon 0.16