More tweaks to get things working with CC3000