More fixes on debian building