Some fixes
COmpilefix