Bug fix

More fatal bug fixes.