Some leftovers from the previous commit