resolve issues raised by Vlademir in SOL002 and SOL003 v3.7.1

1 job for 3.7.1-dev in 0 seconds (queued for 12 seconds)