Additional tweaks regarding electronics