Changed a few things...

Change-Id: Iee9e36a9b25162c61e8db61c35129e3daefc32c2