Fixed a few bugs with members