Fixed several issue with docs compatibility