Mostly bug fixes.