SW-26 minor fixes