Small fixes after merging