Fixes to for comp