Fixes for improved consistency with other guides