Fixed scalar issues.