Attempt to fix weird issues for other people