Fix for recent commit, plus new stories