some updates to work in Chrome again