More missing defaults etc...