Fixed bugs (or at least work arounded).