Update file contents to renamed header #2
Fix compiler errors about forced explicit return
Fix minor compiler warnings