Fixed some unseen bugs after submission