New changes and fixes