Resolver / quitar FIXMEs restantes