Fix some of the new math filters
Pull in some new fixes to core modules