Check the downloads section? There is download that corrects both of your problems at once.