Maintenance fixes for Sente6ToDevn