Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...