Next round of fixing Keen.io