Fixed issues with DevTools