fixes in system messege, for building finished