Fixes after code review in merge request.

16 jobs for 962-solar-cell-eln-base-classes in 67 minutes and 50 seconds (queued for 2 seconds)