Add scalar warning and make scaling more consistent