Minor fixes on first library check on setup