Pull #394 changes from feedback