Fixing some dumb bugs...