Changes and fixes from yesterday