Added missing pieces from port... doh