NProject fixes