Recommit stupid fixes