Fixed another batch of issues