A few Bug fixed