Add in some fixes..