Resolve all compiler warnings
Remove compiler warnings from TODO