More fixes and keyword collision avoidance