Fixed a couple of small build problems on Linux (review with Charlie)

Change-Id: Ia4780f08464081bc7164876199f9d5f1f8fca085