Fixes in various modules
Fix GCMS