Two recent fixes