Fixes after update