Small fixes .Seems like everything is working after the merge with rails4 branch.