Bug fix and limit expansions [skip ci]