Forgot to unmark these static

Change-Id: Iec9c81915c7b6988d7da2d8736d2bd832047441d