Remove NSLog statement
Fix edge cases where row offset would not be preserved.