Fix3

More minor fixes