Fixed some weird stuff