Little fixes after merging