Bug fixs