Some changes to accomodate new work environment. Need to settle the problem with oscpack