Fixing some issues after merging.