A few final changes suggested by jrick