Minor fixes related to imports