Various updates to support python dev