jf: clean up init & warnings

Change-Id: I0e3c43f8608304a5b466c7aeb76305eda5cce092