SOL002 fixes

1 job for 3.3.1-dev in 0 seconds (queued for 11 seconds)