gcc 4 fixes and tidying up
gcc 4 fixes and tidying up

hradec/cortex,hradec/cortex,davidsminor/cortex,appleseedhq/cortex,danieldresser/cortex,davidsminor/cortex,davidsminor/cortex,appleseedhq/cortex,davidsminor/cortex,lento/cortex,danieldresser/cortex,lento/cortex,goddardl/cortex,danieldresser/cortex,hradec/cortex,appleseedhq/cortex,goddardl/cortex,lento/cortex,danieldresser/cortex,goddardl/cortex