Minor fixes

SDUX-47