Some bug fixes for calls