Couple fixes for linux build environment.