More minor fix