Incorporating Chrome fix
Cleanup