a few fixes for last change