Fix/underscore errors