More electronics layout fixes