Weird fixes