Attempt to fix types