Scheme and port fixes