Fix mistakes from library draft