Bug Fixes
Always cmake