Maintenance

Various fixes.