Make several things work correctly