Incorporate changes from Volca's fork