Various updates to support more stuff.