Small issues fixes.