CS fixes

Change-Id: I0a1f750ce054604ddb0226dd8d62921865fdbec9