c55+ fixes