Fix p2p and wpa services init