Patches for check_ups improvement, update and bugfix [sf#1038413] [#341]