Less warnings and working code.