Fix some issues with nested projects