Corrected errors previously commited during manual merge