Fiexed some issues