Integration bugs solved!