Minor changes to hopefully resolve some dependency issues