Needed fixes