cstyle -vcp fixes