fix some weird stuff