Data bugfixes!

(https://trello.com/c/fIaqSV8R)