Fixing some bugs and inefficiencies

Change-Id: I17cf2400ed9c68a095e4c5bb40a31beed89fb9d5
1 file changed