Smaller bug fixes.