Fixing message list population
Some temp jshint fixes