Changes and fixes