A few fixes after talking to Mr_Nones_.