Bug fixes and TTD clean up.
Merge pull request #926 from lonelyplanet/remy-bug_fixes

Bug fixes and TTD tidy up.