fastcharge: couple more changes