Temp error avoidance

Keywords has a slight rewrite