Updated fixes to bugs