Added other forgotten modifications.