Small fixes after merges