Fix for use statements