A few fixes to the last commit. :D