Fixed issues with the new Brackets source (Sprint 25)