Minor fix
Make sure we reset the offset in cleanup and prepareForDisplay