fixes for last merge