Bug fixes related to referenced library importing..