Changes to work with clean install of 4.2