Fixes for mainline, using sloothe, maintenance