Updating docs wrt merged branches
Fixing more compilation problems