Bugfix or two.