Bug fixes and coverage