Various Code Pro fixes

kpmartin