Fixes done by TP-Robot.