fixes for correct build...