adjust madison specific calls to not use a magic number everywhere