More updates and fixes.
Merge pull request #908 from kwilczynski/2014-warsaw

More updates and fixes.