More fixing

I know the description sucks.