Model & Array controller bugfixes