Fixes for field test