Fixes for Raw/Sigmoid