Added scale specific asserts