CRM-9744(warning fixes/clean up)