Fixed a few of plans