Adds all changes that were part of moly's fix