Fixes for failed tests