Fix some stuffs