bug 1053985 - fixes most of the dependent bugs