Fixed few stuffs.