Chris fixes