crowbar & 357 .qc fixes