Bug fixes and line fixes.