Controller, Model, and Migration bug fixes