DIS1189 # Multiple bug fixes