Minor tweaks for better project integration