Thieving fixes