brought things into line with new compiler