Minor fixes after merging