Even more bug fixes.