fixes for testing version 3.1