Fix for issue #367 & #358. Ace editor working again.