Some compilation problems were fixed.