Improved IDE mode compatibilty.