Fixed up all calls and happiness ensues