Various fixes

[samdark]

Q	A
Is bugfix?	❌
New feature?	❌
Breaks BC?	❌
Fixed issues	-

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.32%. Comparing base (d6591f4) to head (37f4fcd).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff            @@
##             master     #385   +/-   ##
=========================================
  Coverage     85.32%   85.32%           
  Complexity      595      595           
=========================================
  Files            17       17           
  Lines          1417     1417           
=========================================
  Hits           1209     1209           
  Misses          208      208           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.