Fixed some trivial compilation problems, etc