more fixes for last commit