Fixes for doc conversion