[FIX] Removed bs_tools warnings (master)