Fixes for Documentation alpha version