Some fixes for upgrade to new version of felix.