Completion tweaks and integration