Bug fixes to get close