Implementation chapter fixes.