Fixing some cimpiling problems