couple of fixes for testing