Further electronics fixes