All: Last small fixes... I hope XD