Fixes for trello bugs

https://trello.com/c/L0mI3tVG
https://trello.com/c/I5efP2RY