Fixes Chrome issues and Fixes #125