Fixes for version 9