Fixes related to SCALE support