more keyword fixes