Updated according to compiler recommendations.