Fixes for part module bugs