Whitespace and deferred fix

Change-Id: I24aacfedc0ed0bdc6af188ef0765e30371d5323f