Fixed known issues