Fixed errors left after merging upstream.