Some warnings and blocks labels fixes