Bogdan
Other bug fixes