Bug fix's