Small fixes related to engineer gameplay