Further Handbook Fixes