Minor fixes for last commit