Fixing optional stuff