Adam gauth tweaks