Fixed Scaler and preprocessors that use annotations

Merged Tiago de Freitas Pereira requested to merge fixes into master

Merge request reports