Small inspector improvements