Fixes

Change-Id: I1acc7726773c3172dd88d98288a994108fe3607c