Fixed some iffy stuff