Library import indicator and bug fixes