Bugs and style fixes.