Fix some imports + package