Fixed some controller socket issues