Small fixes Continued.

Fixed some flags left out in previous commit.