Minor update. Mostly fixed compilation issues.