Some additional bug fixes.