More program fixes