Fixed some issues introduced by the previous pull