Fix an uncountable amount issues