Fixes in PLC Tag