When we update DOA to a new version, we will allways have to fix the 20 warnings and hints by our self.

Please fix this so we can use it without any modifications.