some fixes for the last commit