Small bug fizes
v