F/assorted changes for integration