funkc fixes

Change-Id: I10abaebafaa9d9cf9d5ce2ddf4a2ae57b22f7832