fixes for firefox and safari! changed observe-shim