Fixes for testing