Seeders and minor fixes