Correct various bugs related to auto_skip and groups