Fix compilation errors and some documentation mix-ups.