Model and Controller fixes