Late night fixes for LINC 1.0