Fixes for v0.36.0