Storm surge bug fixes related to function interface bugs