Files changes so it would work on Beta7