fixed warning messages
fix shallow history