Small fixes
Merge branch 'release/2014-05-04'