Fixes for formulae language