Various changes which should fix this achievement.