Bug Fixes from Valex Trello Cards