Add some changes/fixes as per latest SOL025 draft