Fixed another couple of stuff