More fixes for rotating when data is not set.