Fix Randy's mistakes