Some other fixes.