Fixed countless issues