Fix for subpackage imports