Import fixes, initialized some uninitialized variables, etc.