Farm update, fixes compiler complaints