Fixing few stuffs