More clrf fixes