More fixes for #371 similar to #367