Small Inspector fixes