Fixed some problems with various modules