fixes for taejos PR