Various guides fixes