Fixes for Energia