small fixes because sometimes it won't work