Fixed various issues in guide