Fix up a cpl more bugs.