Fixes for testing issues.