Fixed some stuff that probably went wrong with a previous merge.