more mention fixes