Fixes for missing imports