Fixes that allow last commit to work.