More changes

Added changes missed from last commit