more MAC layer fixes