Minor fixes for latest commit