SHINE SP8 fixes

Change-Id: I56a7b6383560b5f8ba1a3afbb5a5bb5ebd5a3af6