build and charger fixes