Fix some problems and javascript injections