Some fixes relating to account limits