Fixed package reference paths