Minor fixes for failing tests