recent fixes