Credo fixes