Fixing some stuffs