compiler tweaks

Change-Id: I012fbb54d35e00ebbd43e1409b84c88ca983ee04