Fixed Me bugs