Pot: Several bugs fixed.