Some more engine work