Fixed some bugs discovered while adding more samples