Fix Stuffs