A few improvments

Change-Id: I285d9f9fce4abf29d47f640ea1990a9b5688cadb