Fixes for failing until tests