Adam fixes