Various updates for development tools