KID build for socket issues fixes