even more recent fixes