Fixed the pieces I missed previously.