Trying to fix some of the IDE supplied issues.