Minor fixes on imports and element lists