Chrome fixes
Close #230