Various Code Pro Fixes

kpmartin