more compilation changes