some fixes for last commit