Fixed more null unit bugs