Code pro fixes

Ok. Sounds good