Fix partial stuffs