Design some fixes