Fix dependencies and improve grunt tasks