Maintenance

Issues I reported