Fixed Dependencies and Type being swapped in panel