Fixed some issues.

for @YagoCarballo