Fixed some weird stuff after the last merge