Small fixes.
Added analog import.