remaining fixes