Some fixes after something happened...