Fixed deployment bugs and specialty requirement