Fixed stuff that got messed up in merging