More work on library loading