Added in some fixes