Couple of simple patches...