Fixes for documentation builds