Fix some upgrade errors
Begin implementation of "custom" editable object classes, fix the rest of integer fields