Some small code fixes to prevent compiler warnings and errors reading a cut file