Fix missing options and properties from models