bot/top fixes