some modifications for Eclipse project compatibility