fixes for Energia