Smalls improvements

Change-Id: Ia2415ae25db07b4ba7561bb8997b30a94253ebef