Fixed compilation problems with strict compiler option