Fix #516

FOUND 2 ERROR(S) AND 24 WARNING(S) AFFECTING 25 LINE(S)