Removed some conflicting flags etc.