Fixes, working in Chrome and Firefox nao