Add addinstance caps and other small fixes for 2.5 compat