Error fixes after merging.