Fixes for manual for 1.8