Changes for #360 #374 #382