Some tweaks for integration