Fixes for the last commit.