Fixing some bugs

not all fields are always there....