diff --git a/FSCHateoasBundle.php b/FSCHateoasBundle.php
index 2747d17..cb1fd68 100644
--- a/FSCHateoasBundle.php
+++ b/FSCHateoasBundle.php
@@ -8,7 +8,7 @@
 
 class FSCHateoasBundle extends Bundle
 {
-	public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
diff --git a/Factory/LinkFactory.php b/Factory/LinkFactory.php
index 6abc269..d55cb2b 100644
--- a/Factory/LinkFactory.php
+++ b/Factory/LinkFactory.php
@@ -8,6 +8,7 @@
 use FSC\HateoasBundle\Metadata\MetadataFactoryInterface;
 use FSC\HateoasBundle\Metadata\ClassMetadataInterface;
 use FSC\HateoasBundle\Metadata\RelationMetadataInterface;
+use FSC\HateoasBundle\Routing\RelationUrlGenerator;
 
 class LinkFactory extends AbstractLinkFactory implements LinkFactoryInterface
 {
@@ -16,8 +17,9 @@ class LinkFactory extends AbstractLinkFactory implements LinkFactoryInterface
     protected $relationUrlGenerator;
 
     public function __construct(MetadataFactoryInterface $metadataFactory,
-                                ParametersFactoryInterface $parametersFactory, $relationUrlGenerator)
-    {
+                                ParametersFactoryInterface $parametersFactory,
+                                RelationUrlGenerator $relationUrlGenerator
+    ) {
         parent::__construct($relationUrlGenerator);
 
         $this->metadataFactory = $metadataFactory;
diff --git a/Routing/UrlGenerator.php b/Routing/UrlGenerator.php
index 3b783a7..fc30e0e 100644
--- a/Routing/UrlGenerator.php
+++ b/Routing/UrlGenerator.php
@@ -37,7 +37,7 @@ public function getContext()
     /**
      * {@inheritdoc}
      */
-    public function generate($name, $parameters = array(), $absolute = false, $options = array())
+    public function generate($name, $parameters = array(), $absolute = false)
     {
         $parameters = array_merge($this->extraParameters, $parameters);