System tweaks - round 1

Change-Id: I50a62c50b3889441b09a2bb56502a891b106cc1a