Import Updates and Fixes