Various updates for 0.9.4