Fixed more copy paste bugs