Fixes on this branch.