Fix several things