Small kfkproto refactoring