Minor fixes to various modules