Fixes for latest release