More Engineer fixes