fix issues with initial load

@nthomson - https://www.pivotaltracker.com/story/show/67236018