Fix issues with mandatory values

https://www.pivotaltracker.com/story/show/67886066
https://www.pivotaltracker.com/story/show/67360400