Issues with inspector fixed