Few more spot fixes.