Fix regression errors