Tweaked compilation logic