Minor bug fises