Small fixes after sync