This should fix all the errors now