Do some easy TODO's
No compiler warnings on both Mac & Linux!