Several small fixes for Analysis II