Fixes for breaking changes