Changes to support bugs