Final touch, removing all warnings.