Fixed some installation problems

Change-Id: Ib075a258311e585c367d421a404b71a57b6b7307