fixes for last two commits