Fixed build, a few classes were  extending non-existent VariableExpression class