Better GND/VCC handling