Fixed several stuffs