erorcun Fixes from miami