Various forgotten changes